Cleaned up loads

Complete rewrite.
Needs work