Added some functionality (doesn't really work yet)