Removed assembly things...not ready for that yet