King and Queen
Merge pull request #3 from ppicinic/base.cleanup-1

Base.cleanup 1
Merge pull request #4 from ppicinic/Models

King and Queen
added missing files
made improvements