removed everything custom, pulled back to the basics