Finished up functions and worked on markup in html site, started on tests