Functionality complete. May add some more style