partial front end overhaul. Not yet consistent