working on making the code more OO-friendly
fixed typo
fixed typos & working on building assocations - presumably