VERSION 2.1

Combined with Jeet's code. Now 2-D, proper OOP paradigms. Grid layout.
Etc.
New icons