All a work in progress, so if you have the time, let me know what I should change or add