not included yet (need to rebranch)

using object{} now... will clean up code but pushing for sake of commented code (just in case)

file-loader