Added functionality in console, riddled with bugs!