Made layers be calculated automagically
Started Clean Up