working on borders
Added border support (was not easy)
Removed some unused and commited by error files