Now working again. Hate my life.
Added files.
Resolved issue #17.
Resolved issue #17.
Fixed all merge issues.