added load points functionality, started making more OO