Pre-updated front end code

Will change a bunch when someone finally merges codys code.