Cleaned code (isolated testing functions; will deal with later).
Cleaned code; isolated testing code (TODO: [Potentially] move to another class)