Core website is done. Code clean up now