v1.2

Moved some code around and added additional comments for a quicker reference/documentation