Cleaned up some code, added tmp laser