Initial Push (reworked logic - only meant to handle calculations)