Cleaned up code and full conversion to Forge