Population

Cleaned up conflicting files to allow for a cleaner merge, closed conflicting merge request #15.