Removed everything and threw some new stuff together