Adding more code

Might still have problems, thus requiring future updates