objects everywhere

js combined to one file, object formatted