getting a little bit closer to having a good base functionality