Renamed target for easier
moved definitions around
added functionality and removed debugging output
added good calls