Basic functionality now works, minus JS