final commit, website works :D