whole page almost done, forgot to commit :D