Added some basic stuff

Mostly testing stuff