Finally something presentable (still a work in progress though)