Initial Commit
Reverted the block-based changes since it creates more issues than it solves