Fixed issues with Setup and added run functionality